From: Kunal Mehta <legoktm@member.fsf.org>
Date: Mon, 4 Jun 2018 20:35:06 +0000 (-0700)
Subject: Deprecate $wgDBmysql5
X-Git-Tag: 1.31.0~13
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/Template:Foo?a=commitdiff_plain;h=018a422579a4576b3d7162c91ae04b666a6fe184;p=lhc%2Fweb%2Fwiklou.git

Deprecate $wgDBmysql5

Bug: T196185
Change-Id: Iea74b5dd1fc49c911dcc0070604f05100e56ce0d
(cherry picked from commit 7271d50bab79231efcedeabf5fbe4db0aa13fa4d)
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 77c3f58d19..d369ac6ea0 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -52,6 +52,8 @@ production.
   whether any AJAX functionality at all should be enabled, further making this
   problematic to retain.
 * Add default edit rate limit of 90 edits/minute for all users.
+* $wgDBmysql5 is now deprecated, and will be removed in a future version. It
+  has been marked as experimental ever since it was introduced.
 
 === New features in 1.31 ===
 * (T76554) User sub-pages named ….json are now protected in the same way that
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2dad6c537b..811ac9b229 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2032,6 +2032,8 @@ $wgDBerrorLogTZ = false;
  * Even correct usage may cause failures with Unicode supplementary
  * characters (those not in the Basic Multilingual Plane) unless MySQL
  * has enhanced their Unicode support.
+ *
+ * @deprecated since 1.31
  */
 $wgDBmysql5 = false;